merge.
authorIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Mon, 27 Feb 2006 10:59:31 +0000 (10:59 +0000)
committerIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Mon, 27 Feb 2006 10:59:31 +0000 (10:59 +0000)

Trivial merge